c27988faf908fad5R472">472 
+    title = models.CharField(_(u'title'), max_length=255, blank=True, null=True, help_text=u'活动名称')
473 
+
474 
+    is_integral = models.BooleanField(_(u'is_integral'), default=False, help_text=u'是否有积分')
475 
+    integral = models.IntegerField(_(u'integral'), default=0, help_text=u'积分')
476 
+
477 
+    class Meta:
478 
+        verbose_name = _(u'会员活动群组分享信息')
479 
+        verbose_name_plural = _(u'会员活动群组分享信息')
480 
+
481 
+    def __unicode__(self):
482 
+        return unicode(self.pk)

+ 38 - 0
message/migrations/0014_auto_20201130_0131.py
ファイルの表示 

@@ -0,0 +1,38 @@
1 
+# Generated by Django 2.2.15 on 2020-11-29 17:31
2 
+
3 
+from django.db import migrations, models
4 
+
5 
+
6 
+class Migration(migrations.Migration):
7 
+
8 
+    dependencies = [
9 
+        ('message', '0013_auto_20180103_0446'),
10 
+    ]
11 
+
12 
+    operations = [
13 
+        migrations.AlterField(
14 
+            model_name='systemmessagedeleteinfo',
15 
+            name='status',
16 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
17 
+        ),
18 
+        migrations.AlterField(
19 
+            model_name='systemmessageinfo',
20 
+            name='status',
21 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
22 
+        ),
23 
+        migrations.AlterField(
24 
+            model_name='systemmessagereadinfo',
25 
+            name='status',
26 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
27 
+        ),
28 
+        migrations.AlterField(
29 
+            model_name='usermessageinfo',
30 
+            name='msg_type',
31 
+            field=models.CharField(db_index=True, default='system', help_text='消息类型', max_length=8, verbose_name='msg_type'),
32 
+        ),
33 
+        migrations.AlterField(
34 
+            model_name='usermessageinfo',
35 
+            name='status',
36 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
37 
+        ),
38 
+    ]

+ 48 - 0
operation/migrations/0019_auto_20201130_0131.py
ファイルの表示 

@@ -0,0 +1,48 @@
1 
+# Generated by Django 2.2.15 on 2020-11-29 17:31
2 
+
3 
+from django.db import migrations, models
4 
+
5 
+
6 
+class Migration(migrations.Migration):
7 
+
8 
+    dependencies = [
9 
+        ('operation', '0018_auto_20180114_2314'),
10 
+    ]
11 
+
12 
+    operations = [
13 
+        migrations.AlterField(
14 
+            model_name='appsettingsinfo',
15 
+            name='status',
16 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
17 
+        ),
18 
+        migrations.AlterField(
19 
+            model_name='boxprogramversioninfo',
20 
+            name='status',
21 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
22 
+        ),
23 
+        migrations.AlterField(
24 
+            model_name='feedbackinfo',
25 
+            name='status',
26 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
27 
+        ),
28 
+        migrations.AlterField(
29 
+            model_name='guestentrancecontrolinfo',
30 
+            name='status',
31 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
32 
+        ),
33 
+        migrations.AlterField(
34 
+            model_name='latestappinfo',
35 
+            name='status',
36 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
37 
+        ),
38 
+        migrations.AlterField(
39 
+            model_name='patchinfo',
40 
+            name='status',
41 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
42 
+        ),
43 
+        migrations.AlterField(
44 
+            model_name='splashinfo',
45 
+            name='status',
46 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
47 
+        ),
48 
+    ]

+ 18 - 0
pay/migrations/0012_auto_20201130_0131.py
ファイルの表示 

@@ -0,0 +1,18 @@
1 
+# Generated by Django 2.2.15 on 2020-11-29 17:31
2 
+
3 
+from django.db import migrations, models
4 
+
5 
+
6 
+class Migration(migrations.Migration):
7 
+
8 
+    dependencies = [
9 
+        ('pay', '0011_auto_20180103_0446'),
10 
+    ]
11 
+
12 
+    operations = [
13 
+        migrations.AlterField(
14 
+            model_name='orderinfo',
15 
+            name='status',
16 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
17 
+        ),
18 
+    ]

+ 28 - 0
photo/migrations/0014_auto_20201130_0131.py
ファイルの表示 

@@ -0,0 +1,28 @@
1 
+# Generated by Django 2.2.15 on 2020-11-29 17:31
2 
+
3 
+from django.db import migrations, models
4 
+
5 
+
6 
+class Migration(migrations.Migration):
7 
+
8 
+    dependencies = [
9 
+        ('photo', '0013_auto_20180103_0446'),
10 
+    ]
11 
+
12 
+    operations = [
13 
+        migrations.AlterField(
14 
+            model_name='photosinfo',
15 
+            name='status',
16 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
17 
+        ),
18 
+        migrations.AlterField(
19 
+            model_name='photouuidinfo',
20 
+            name='status',
21 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
22 
+        ),
23 
+        migrations.AlterField(
24 
+            model_name='uuidinfo',
25 
+            name='status',
26 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
27 
+        ),
28 
+    ]

+ 1 - 1
requirements_dj.txt
ファイルの表示 

@@ -11,7 +11,7 @@ django-json-render==1.0.3
11 11 
 django-json-response==1.1.5
12 12 
 django-logit==1.1.3
13 13 
 django-mobi2==1.0.2
14 
-django-models-ext==1.1.9
14 
+django-models-ext==1.1.10
15 15 
 django-multidomain==1.1.4
16 16 
 django-paginator2==1.1.3
17 17 
 django-query==1.0.6

+ 1 - 1
requirements_pywe.txt
ファイルの表示 

@@ -7,7 +7,7 @@ pywe-marketcode==1.0.3
7 7 
 pywe-membercard==1.0.1
8 8 
 pywe-custom-message==1.0.1
9 9 
 pywe-event-message==1.0.1
10 
-pywe-miniapp==1.1.5
10 
+pywe-miniapp==1.1.6
11 11 
 pywe-oauth==1.1.1
12 12 
 pywe-pay==1.0.13
13 13 
 pywe-pay-notify==1.0.5

+ 28 - 0
sales/migrations/0008_auto_20201130_0131.py
ファイルの表示 

@@ -0,0 +1,28 @@
1 
+# Generated by Django 2.2.15 on 2020-11-29 17:31
2 
+
3 
+from django.db import migrations, models
4 
+
5 
+
6 
+class Migration(migrations.Migration):
7 
+
8 
+    dependencies = [
9 
+        ('sales', '0007_supersalesresponsibilityinfomodelssalestatisticinfo_sr_avatar'),
10 
+    ]
11 
+
12 
+    operations = [
13 
+        migrations.AlterField(
14 
+            model_name='salesresponsibilityinfo',
15 
+            name='status',
16 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
17 
+        ),
18 
+        migrations.AlterField(
19 
+            model_name='salesresponsibilityinfomodelssalestatisticinfo',
20 
+            name='status',
21 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
22 
+        ),
23 
+        migrations.AlterField(
24 
+            model_name='supersalesresponsibilityinfomodelssalestatisticinfo',
25 
+            name='status',
26 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
27 
+        ),
28 
+    ]

+ 18 - 0
staff/migrations/0002_auto_20201130_0131.py
ファイルの表示 

@@ -0,0 +1,18 @@
1 
+# Generated by Django 2.2.15 on 2020-11-29 17:31
2 
+
3 
+from django.db import migrations, models
4 
+
5 
+
6 
+class Migration(migrations.Migration):
7 
+
8 
+    dependencies = [
9 
+        ('staff', '0001_initial'),
10 
+    ]
11 
+
12 
+    operations = [
13 
+        migrations.AlterField(
14 
+            model_name='staffdeleteclerksalesubmitloginfo',
15 
+            name='status',
16 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
17 
+        ),
18 
+    ]

+ 68 - 0
statistic/migrations/0016_auto_20201130_0131.py
ファイルの表示 

@@ -0,0 +1,68 @@
1 
+# Generated by Django 2.2.15 on 2020-11-29 17:31
2 
+
3 
+from django.db import migrations, models
4 
+
5 
+
6 
+class Migration(migrations.Migration):
7 
+
8 
+    dependencies = [
9 
+        ('statistic', '0015_modelsalestatisticinfo_saleclerks'),
10 
+    ]
11 
+
12 
+    operations = [
13 
+        migrations.AlterField(
14 
+            model_name='consumedistributorsalestatisticinfo',
15 
+            name='status',
16 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
17 
+        ),
18 
+        migrations.AlterField(
19 
+            model_name='consumemodelsalestatisticinfo',
20 
+            name='status',
21 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
22 
+        ),
23 
+        migrations.AlterField(
24 
+            model_name='consumeprovincesalestatisticinfo',
25 
+            name='status',
26 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
27 
+        ),
28 
+        migrations.AlterField(
29 
+            model_name='consumesalestatisticinfo',
30 
+            name='status',
31 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
32 
+        ),
33 
+        migrations.AlterField(
34 
+            model_name='consumeuserstatisticinfo',
35 
+            name='status',
36 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
37 
+        ),
38 
+        migrations.AlterField(
39 
+            model_name='distributorsalestatisticinfo',
40 
+            name='status',
41 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
42 
+        ),
43 
+        migrations.AlterField(
44 
+            model_name='modelsalestatisticinfo',
45 
+            name='status',
46 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
47 
+        ),
48 
+        migrations.AlterField(
49 
+            model_name='provincesalestatisticinfo',
50 
+            name='status',
51 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
52 
+        ),
53 
+        migrations.AlterField(
54 
+            model_name='registerstatisticinfo',
55 
+            name='status',
56 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
57 
+        ),
58 
+        migrations.AlterField(
59 
+            model_name='saleclerksalestatisticinfo',
60 
+            name='status',
61 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
62 
+        ),
63 
+        migrations.AlterField(
64 
+            model_name='salestatisticinfo',
65 
+            name='status',
66 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
67 
+        ),
68 
+    ]

Change to use django-uniapi · 953ffaab3c - Gogs: Go Git Service
Home Esplora Aiuto
Registrati Accedi
Kodo
/
kodo
Segui 2
Vota 0
Forka 0

Sfoglia il codice sorgente
Change to use django-uniapi

Brightcells 8 anni fa
parent
f3ba854b18
commit
953ffaab3c
5 ha cambiato i file con 6 aggiunte e 14 eliminazioni
Mostra Diff Stats
  1. 1 7
      api/urls.py
  2. 2 7
      api/views.py
  3. 1 0
      pai2/settings.py
  4. 1 0
      pai2/urls.py
  5. 1 0
      requirements.txt

+ 1 - 7
api/urls.py
Vedi File 

@@ -5,7 +5,6 @@ from django_we import views as we_views
5 5
6 6 
 from account import views as account_views
7 7 
 from account import tourguide_views
8 
-from api import views as api_views
9 8 
 from box import views as box_views
10 9 
 from geo import views as geo_views
11 10 
 from group import views as group_views
 
@@ -19,13 +18,8 @@ from photo import views as photo_views
19 18 
 from server import server_views
20 19
21 20
22 
-# 测试方式：取消注释，请求接口
23 
-urlpatterns = [
24 
-    # url(r'^test$', api_views.mail_error_test, name='mail_error_test'),  # 邮件发送错误信息测试接口
25 
-]
26 
-
27 21 
 # 帐户相关
28 
-urlpatterns += [
22 
+urlpatterns = [
29 23 
     url(r'^u/wx/authorize$', account_views.user_wx_authorize_api, name='user_wx_authorize_api'),  # 用户端 - 微信用户授权
30 24
31 25 
     url(r'^u/guest/status$', op_views.guest_api, name='user_guest_status_api'),  # 用户端 - 微游客状态(是否开启)

+ 2 - 7
api/views.py
Vedi File 

@@ -1,9 +1,4 @@
1 
-# -*- coding: utf-8 -*-
1 
+from django.shortcuts import render
2 2
3 
-from utils.error.response_utils import response
4 3
5 
-
6 
-def mail_error_test(request):
7 
-    # Raise ZeroDivisionError
8 
-    1 / 0
9 
-    return response()
4 
+# Create your views here.

+ 1 - 0
pai2/settings.py
Vedi File 

@@ -44,6 +44,7 @@ INSTALLED_APPS = (
44 44 
     'rest_framework',
45 45 
     'django_q',
46 46 
     'django_rlog',
47 
+    'django_uniapi',
47 48 
     'django_we',
48 49 
     'api',
49 50 
     'account',

+ 1 - 0
pai2/urls.py
Vedi File 

@@ -89,6 +89,7 @@ urlpatterns += [
89 89 
 urlpatterns += [
90 90 
     url(r'^api/', include(router.urls)),
91 91 
     url(r'^page/', include('page.urls', namespace='page')),
92 
+    url(r'^uniapi/', include('django_uniapi.urls', namespace='uniapi')),
92 93 
     url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework'))
93 94 
 ]
94 95

+ 1 - 0
requirements.txt
Vedi File 

@@ -18,6 +18,7 @@ django-paginator2==1.0.3
18 18 
 django-rlog==1.0.7
19 19 
 django-shortuuidfield==0.1.3
20 20 
 django-six==1.0.2
21 
+django-uniapi==1.0.0
21 22 
 django-we==1.0.1
22 23 
 djangorestframework==3.6.3
23 24 
 furl==1.0.0